projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ebe3ebd) | patch
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 14 Jan 2011 18:10:15 +0000 (13:10 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 14 Jan 2011 18:10:15 +0000 (13:10 -0500)
commit87e809aca3407a93ccd7cf596335c0c31e9bf1f1
treeded9c88c88e75e0674e9d76d2a448acc938a637ctree | snapshot
parentebe3ebd975cd5e53088d311c0c4d0d7d963d9e60commit | diff
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
(smerge-resolve--normalize-re): New var.
(smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.
(smerge-resolve): Use them.
* lisp/newcomment.el (comment-only-p): New function.
(comment-or-uncomment-region): Use it.
lisp/ChangeLog diff | blob | history
lisp/newcomment.el diff | blob | history
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.